Display an error when we come to the root.

2006-09-19  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
	Display an error when we come to the root.

diff --git a/ChangeLog b/ChangeLog
index 4b486d22066e53259e59ba8806170990b686e301..9171dd076e01a11c0f1a127aa426153612c3c680 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-19  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
+       Display an error when we come to the root.  
+
 2006-09-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c: Use bookmark labels in 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e580f894dc4b7158fda3cab6276ac6aa81a39ee6..c5338b9b69ef938d9d21ae5188e07bc943c09c88 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6174,7 +6174,8 @@ update_current_folder_get_info_cb (GtkFileSystemHandle *handle,
        }
 
       /* get parent path and try to change the folder to that */
-      if (gtk_file_system_get_parent (impl->file_system, data->path, &parent_path, NULL))
+      if (gtk_file_system_get_parent (impl->file_system, data->path, &parent_path, NULL) &&
+         parent_path != NULL)
         {
          gtk_file_path_free (data->path);
          data->path = parent_path;